From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Jun 2021 16:46:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3216'
X-Git-Tag: live~1593
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/616f3783df3f03dd0cab6f024d2f00bd5e1ce9ff

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

616f3783df3f03dd0cab6f024d2f00bd5e1ce9ff