Bug #3392 - Add Heroku support