From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Apr 2021 17:34:10 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3172'
X-Git-Tag: live~1666
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/13499b19f9abee54fc5d3d8d92f206b42b7b2757

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

13499b19f9abee54fc5d3d8d92f206b42b7b2757