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

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

7f24a2f1d621a4a3e784fd289604a17086b88d6d