From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Apr 2019 18:06:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2196'
X-Git-Tag: live~2593
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/670603e927b3387d3a8a062a98d8885326119dea?hp=1f13321a60239881f7016044b79e9a4d58045e30

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