From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Nov 2018 11:58:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2038'
X-Git-Tag: live~3376
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/391fb933f59075e36e9cea5ea35f5a5efdfc257e?hp=--cc

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

391fb933f59075e36e9cea5ea35f5a5efdfc257e