From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Apr 2018 18:57:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1820'
X-Git-Tag: live~3111
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2160f820ac9fe3f78deb97a3a4285e9bf8daa095

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

2160f820ac9fe3f78deb97a3a4285e9bf8daa095