From: Tom Hughes <tom@compton.nu>
Date: Thu, 24 May 2018 18:06:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1880'
X-Git-Tag: live~2968
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0a3a4014d9ec26d8a818fc2fb55ff98a83ee8152

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

0a3a4014d9ec26d8a818fc2fb55ff98a83ee8152