From: Tom Hughes <tom@compton.nu>
Date: Wed, 31 Oct 2018 18:33:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2039'
X-Git-Tag: live~2964
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5b062f03151021fd00af77b8e9e888c8a6950384?ds=sidebyside;hp=5b062f03151021fd00af77b8e9e888c8a6950384

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