From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2018 16:33:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1798'
X-Git-Tag: live~3082
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f3b6e0faa1cbf92b46555bea2fca62ca1895e703?hp=-c

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

f3b6e0faa1cbf92b46555bea2fca62ca1895e703