From: Tom Hughes <tom@compton.nu>
Date: Wed, 7 Apr 2021 15:42:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3165'
X-Git-Tag: live~1692
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c105164d7e652dec72a4bff0a47ef96540a6f5ba?hp=094d6c8bb9949825e1e66b07ba39190a8b57aa0b

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