From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Dec 2018 18:40:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2084'
X-Git-Tag: live~2764
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7bb15e02cc0ddd358ff5283fb2e3fbf77ab3fd7a?ds=sidebyside

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

7bb15e02cc0ddd358ff5283fb2e3fbf77ab3fd7a