Update the other gems
Merge branch 'master' into offsite

Conflicts:
	Gemfile.lock