From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Jul 2020 18:10:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2698'
X-Git-Tag: live~2159
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cfb2f2988c0a396f2d2b167d3c75461b7e811e1c?ds=sidebyside

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

cfb2f2988c0a396f2d2b167d3c75461b7e811e1c