From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 May 2018 17:57:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1866'
X-Git-Tag: live~3060
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9c04912f1deb7b114c61e838a6e4a4b7775167d8

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

9c04912f1deb7b114c61e838a6e4a4b7775167d8