From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Nov 2018 21:11:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2078'
X-Git-Tag: live~3359
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/4a11c8c4f3e1af5b5e37387ad38bed276213d82f?ds=inline;hp=4a11c8c4f3e1af5b5e37387ad38bed276213d82f

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