From: Tom Hughes <tom@compton.nu>
Date: Wed, 15 Jan 2020 12:16:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2504'
X-Git-Tag: live~3168
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6049a2d2744094dcf8fe9ad6085fc3f01e4bc912

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

6049a2d2744094dcf8fe9ad6085fc3f01e4bc912