From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Apr 2018 20:26:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1815'
X-Git-Tag: live~3110
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4c9ec6a60cbd973ab637123a71894c4c97e8965f

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

4c9ec6a60cbd973ab637123a71894c4c97e8965f