From: Tom Hughes <tom@compton.nu>
Date: Fri, 2 Jul 2021 12:56:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3246'
X-Git-Tag: live~2556
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f6ee9cd9400ebb25537158102df8f3611404f67d?hp=f2c57e0d71bbcb407ef43ee7c8c8458c76faeab6

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