From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jun 2018 13:28:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1895'
X-Git-Tag: live~2999
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5f31e8d99d1a2d6e044b1607a8c31b00bd269342

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

5f31e8d99d1a2d6e044b1607a8c31b00bd269342