Merge in updates from heroku