From: Tom Hughes <tom@compton.nu>
Date: Mon, 18 Jan 2021 08:02:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3060'
X-Git-Tag: live~2312
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/3a6397fb2a361efc6f804fa7748447b61f1b6f6b?hp=-c

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

3a6397fb2a361efc6f804fa7748447b61f1b6f6b