Trying to fix issue with heroku
Merge remote-tracking branch 'heroku/master'