Merge remote-tracking branch 'FiloSottille/supports'