From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Apr 2020 13:42:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2599'
X-Git-Tag: live~2312
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/62d35fb9724e65c7a5d3e57cff1d341226730e10?hp=32e46ad4e34c69a5d4560fd0fd16a2ee7d4153d0

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