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

author Tom Hughes <tom@compton.nu>

Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)

committer Tom Hughes <tom@compton.nu>

Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)
author Tom Hughes <tom@compton.nu>
Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)
committer Tom Hughes <tom@compton.nu>
Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)
diff --cc app/controllers/application_controller.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)
committer	Tom Hughes <tom@compton.nu>
	Sun, 26 Feb 2017 22:22:48 +0000 (22:22 +0000)