From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Jan 2019 17:14:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2105'
X-Git-Tag: live~2796
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1b292d2389986ab5c8a5db19dccdb635f4d7d2d0?hp=1b292d2389986ab5c8a5db19dccdb635f4d7d2d0

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