Merge remote-tracking branch 'heroku/master' into feature/merge-heroku-ruby-pack

Conflicts:
	lib/language_pack/ruby.rb