From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Aug 2018 16:55:01 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1958'
X-Git-Tag: live~2919
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9fe97ad70f4eba2007801a4c4e083ce86b8d4bbf

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

9fe97ad70f4eba2007801a4c4e083ce86b8d4bbf