From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Dec 2018 18:33:23 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2083'
X-Git-Tag: live~2770
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c203edda20370bb1760a091356f334d342ccb25b?hp=-c;ds=sidebyside

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

c203edda20370bb1760a091356f334d342ccb25b