From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 Nov 2020 08:17:13 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2939' into master
X-Git-Tag: live~2413
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5dcb0737da48706fde539da00b8c6259d0aee136

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

5dcb0737da48706fde539da00b8c6259d0aee136