From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Aug 2018 07:36:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1961'
X-Git-Tag: live~2910
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/db39876dd6f0bccb36e4cdde0e1a0da81a05fcfe

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

db39876dd6f0bccb36e4cdde0e1a0da81a05fcfe