From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Aug 2020 07:20:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2769'
X-Git-Tag: live~3015
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6214fbacf2ba7c932721bd7bdbeb6fe0ef13b0e3?ds=sidebyside;hp=--cc

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

6214fbacf2ba7c932721bd7bdbeb6fe0ef13b0e3