From: Tom Hughes <tom@compton.nu>
Date: Mon, 14 May 2018 19:13:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1857'
X-Git-Tag: live~4010
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/33ea119c8f520a7e679e38b569c202976907a501

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

33ea119c8f520a7e679e38b569c202976907a501