From: Tom Hughes <tom@compton.nu>
Date: Thu, 16 Nov 2017 10:17:06 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1682'
X-Git-Tag: live~3233
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/38efb6c957a48b6d2a242de7608ec95f9db2bb60

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

38efb6c957a48b6d2a242de7608ec95f9db2bb60