From: Tom Hughes <tom@compton.nu>
Date: Tue, 25 May 2021 14:30:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3206'
X-Git-Tag: live~1664
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/92a321911c11a0b5e052b1bf75463a479462960e?hp=40a3ecb66de42ed7d0bb538377d17abc505d8acd

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