Merge remote-tracking branch 'heroku/master'
Rebranding with s3pository bypassed