From: Tom Hughes <tom@compton.nu>
Date: Wed, 17 Jul 2019 17:47:02 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2322'
X-Git-Tag: live~2466
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/43b0d4236300e65c5fa9f9c49f348e95f96bcc16?hp=add6f9643b8c14ec29c607b8ca3adfa83ff8754c

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