From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Apr 2018 14:25:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1801'
X-Git-Tag: live~3056
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/10c3230e2716d5791e1007e5762988fec57e0a4d

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

10c3230e2716d5791e1007e5762988fec57e0a4d