From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 Feb 2020 12:38:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2534'
X-Git-Tag: live~2834
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/21eaf0d6eca1d25ecd08b6d4640df817ff4f6bf3?ds=inline;hp=-c

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

21eaf0d6eca1d25ecd08b6d4640df817ff4f6bf3