From: Tom Hughes <tom@compton.nu>
Date: Mon, 29 Jan 2018 18:54:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1726'
X-Git-Tag: live~4164
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/630b43a0b1a8b5850c7b1ed2f20ecf52a9d280ee?ds=sidebyside

Merge remote-tracking branch 'upstream/pull/1726'
---

630b43a0b1a8b5850c7b1ed2f20ecf52a9d280ee