From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 May 2019 10:05:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2236'
X-Git-Tag: live~2590
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/21bf5d79d680f7dc0447b1b5980ad5ce0a4b830c?hp=8ae8768cd352b2b85d61c4c04c0fc5caa82fcdbe

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