From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Jun 2019 18:16:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2228'
X-Git-Tag: live~2571
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/24b138db094e4b5e8d062c5248ee867967dc0fd7?hp=24b138db094e4b5e8d062c5248ee867967dc0fd7;ds=sidebyside

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