Upgrade multi_test.
Merge remote-tracking branch 'origin/master' into coop

Conflicts:
	Gemfile.lock