From: Tom Hughes <tom@compton.nu>
Date: Sun, 4 Nov 2018 14:49:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2042'
X-Git-Tag: live~2815
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/acfbc091982fbf74baeef7d16ff7d84f63c84951?hp=-c

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

acfbc091982fbf74baeef7d16ff7d84f63c84951