Update mysql2.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	Gemfile.lock
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile.lock