From: Tom Hughes <tom@compton.nu>
Date: Wed, 18 Apr 2018 17:36:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1824'
X-Git-Tag: live~3113
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7a64ebe98265ff8ad6be5b8be9481661cd824f0f

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

7a64ebe98265ff8ad6be5b8be9481661cd824f0f