Merge latest heroku buildpack