From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Apr 2018 16:38:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1837'
X-Git-Tag: live~3029
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aebfbdcfbdb772914ca55c1b5f957f62c1c9cf24

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

aebfbdcfbdb772914ca55c1b5f957f62c1c9cf24