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

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

568a447a8cf8a9e3af4f0d776c7a776db7ab32c7