From: Tom Hughes <tom@compton.nu>
Date: Wed, 27 Mar 2019 10:38:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2187'
X-Git-Tag: live~2680
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cebb05a3ba6313c245509d7966cec184936f9c42?hp=3834ed45e6a383dc5b4fd72090abf692731ecd52

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