From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Jun 2021 18:14:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3239'
X-Git-Tag: live~2587
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d32d8cda46d75f30fe99014b830785c302b7bf17?hp=04ac7d9c030dcccd7e27aef0d8ffe8f09315fae7

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