From: Tom Hughes <tom@compton.nu>
Date: Thu, 1 Nov 2018 18:01:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2037'
X-Git-Tag: live~2946
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0e7cc08c7b1055341dc01cfdc331fac1a13964c1?hp=0e7cc08c7b1055341dc01cfdc331fac1a13964c1

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