Heroku changes

This will help us monitor changes on the Heroku branch.