Merge latest from upstream (heroku/heroku-buildpack-ruby)