From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jul 2020 15:48:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2726'
X-Git-Tag: live~2146
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/86428201ddda4963855f01e768fb1e1813a7c86a?hp=86428201ddda4963855f01e768fb1e1813a7c86a

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