Incorporate changes from heroku branch