From: Tom Hughes <tom@compton.nu>
Date: Tue, 24 Oct 2017 18:41:46 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1658'
X-Git-Tag: live~3288
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/647a3a7d3951b1bf7ab7034796e44f1cd2541347

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

647a3a7d3951b1bf7ab7034796e44f1cd2541347