From: Tom Hughes <tom@compton.nu>
Date: Sun, 13 May 2018 14:23:54 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1850'
X-Git-Tag: live~3029
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bc39159a68284e995f88805ed6af2ab3408a4ed0

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

bc39159a68284e995f88805ed6af2ab3408a4ed0