From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Feb 2019 18:15:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2125'
X-Git-Tag: live~2737
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c18e679be36b95fbf86a1dd5293d74ab70f6db4f

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

c18e679be36b95fbf86a1dd5293d74ab70f6db4f