From: Tom Hughes <tom@compton.nu>
Date: Fri, 4 Jun 2021 20:10:32 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3213'
X-Git-Tag: live~2816
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3b32753141d0576eab0c6e3eba0a8850d1e548a5?hp=3b32753141d0576eab0c6e3eba0a8850d1e548a5

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