From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2018 16:33:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1797'
X-Git-Tag: live~3115
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/be35d4ab9cfc7e18df1b3d4f2d58d8aea1eb8f4c?hp=-c

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

be35d4ab9cfc7e18df1b3d4f2d58d8aea1eb8f4c