From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Apr 2018 14:18:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1800'
X-Git-Tag: live~3102
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/87dfbda93261b50332381d0c0c685a71a3b897ad?hp=efd17cfbe9e02467e4275d3793ff8e6d7cec4815

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