Heroku compatible
Merge branch 'heroku'