From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Feb 2019 19:17:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2161'
X-Git-Tag: live~2788
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/94b59f440321846760d430fee378f05a6a2803ee?hp=94b59f440321846760d430fee378f05a6a2803ee

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