From: Tom Hughes <tom@compton.nu>
Date: Wed, 14 Nov 2018 10:48:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2058'
X-Git-Tag: live~4161
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/94a48482e0bef11bdaf11f0200b4296ee8fabf23?hp=252b9ef08a0b0b7d34eea83149cb1a8ad7af9e34

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