Bundled changes for heroku push