Sync heroku with master