From: Tom Hughes <tom@compton.nu>
Date: Thu, 11 Oct 2018 17:47:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2018'
X-Git-Tag: live~2867
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1aa63d92bcbcca6edcd66c55a026e0b1e4413603

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

1aa63d92bcbcca6edcd66c55a026e0b1e4413603