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

Enough bundler 1.3.pre! :wink: