From: Tom Hughes <tom@compton.nu>
Date: Wed, 1 Dec 2021 18:22:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3388'
X-Git-Tag: live~1299
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/46948d43590f12faf8af39b51b10b805717daddd?hp=d8cbbbc4ad7a54941f74d8c365bb0377046f48d2

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