Merge remote-tracking branch 'heroku-staging/master'
Merge branch 'master' of https://github.com/benetech/ImageDescService