From: Tom Hughes <tom@compton.nu>
Date: Wed, 20 Nov 2019 19:17:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2434'
X-Git-Tag: live~2440
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/81fb26d840767e04d364a0a24d186e1a35ab4b5f?hp=-c

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

81fb26d840767e04d364a0a24d186e1a35ab4b5f