From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Jan 2022 18:15:46 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3416'
X-Git-Tag: live~2376
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/13c70d3195812b8bcdbae4c35f3f9d00eb78c9b9?hp=98d6d7c10d316e2cd33c7cef773a204cb9671104

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