Merge remote-tracking branch 'heroku/master'

trying to fix issues
Merge remote-tracking branch 'heroku/master'