Merge remote-tracking branch 'remotes/heroku/master'

Conflicts:
	Gemfile