From: Tom Hughes <tom@compton.nu>
Date: Sun, 6 Dec 2020 19:21:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2996' into master
X-Git-Tag: live~3082
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6bfecfce1f3ac6fa6e69d6743da816e051446a85?hp=d5d92e60564dcd322a736c4bd3ddf831631d9c0e

Merge remote-tracking branch 'upstream/pull/2996' into master
---