From: Tom Hughes <tom@compton.nu>
Date: Wed, 14 Jul 2021 18:20:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3258'
X-Git-Tag: live~2899
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/78f38502cbe30aeddcd920a37ec6109f874a183a?hp=0ab9359f9f1ed4b14e16d660e4ab6bf86f7f0164

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