From: Tom Hughes <tom@compton.nu>
Date: Mon, 10 Sep 2018 17:53:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1984'
X-Git-Tag: live~2891
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/995a5f89c2cbcac2f570c60ffa257f7655756e97?hp=--cc

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

995a5f89c2cbcac2f570c60ffa257f7655756e97