From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Sep 2018 16:02:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2001'
X-Git-Tag: live~2872
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c356e670ce210cafaf9a191a7323e6c67722bee6?hp=-c

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

c356e670ce210cafaf9a191a7323e6c67722bee6