Merge remote-tracking branch 'openstreetmap/pull/1350'

author Tom Hughes <tom@compton.nu>

Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)

committer Tom Hughes <tom@compton.nu>

Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)
author Tom Hughes <tom@compton.nu>
Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)
committer Tom Hughes <tom@compton.nu>
Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)
diff --cc Gemfile.lock
Simple merge
diff --cc test/test_helper.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)
committer	Tom Hughes <tom@compton.nu>
	Wed, 9 Nov 2016 20:32:54 +0000 (20:32 +0000)
		1	2
Gemfile.lock	patch \|	diff1 \|	diff2 \|	blob \| history
test/test_helper.rb	patch \|	diff1 \|	diff2 \|	blob \| history