From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Sep 2018 18:01:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1986'
X-Git-Tag: live~2957
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/276599d34fcbd7babc8e34b6859459cb44acabe7?hp=--cc

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

276599d34fcbd7babc8e34b6859459cb44acabe7