Merge remote-tracking branch 'upstream/master' into signed-requests

Conflicts:
	test/test_helper.rb