From: Tom Hughes <tom@compton.nu>
Date: Sun, 13 May 2018 14:24:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1851'
X-Git-Tag: live~4042
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/d7063ab0a9db4cb833e89c5cde08c005b7940c9a?ds=sidebyside;hp=-c

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

d7063ab0a9db4cb833e89c5cde08c005b7940c9a