Merging changes from latest heroku-buildpack-ruby