From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Sep 2020 07:59:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2821'
X-Git-Tag: live~3200
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bc7e832521ad5f83283f7b12e8804d5f4c12aa0d?hp=8a1298df6bfa53337aed01435337a7a9cf1cdf31

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