From: Tom Hughes <tom@compton.nu>
Date: Mon, 21 Jun 2021 21:21:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3229'
X-Git-Tag: live~1524
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4f63234e237d58b294ba98911eaf05670f2d3a98?hp=-c

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

4f63234e237d58b294ba98911eaf05670f2d3a98