From: Tom Hughes <tom@compton.nu>
Date: Fri, 13 Nov 2020 09:49:10 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2957' into master
X-Git-Tag: live~3098
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/74e6b468aca7b6a716efbdfa1941448d3c48bb4b?hp=5c69fc77f9b49456a5b5f79c8e7adce149769ee6

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