From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Jan 2019 10:15:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2111'
X-Git-Tag: live~3322
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/6fb660f0af737fe3029943e0b9ab34cbbce54e27?hp=6fb660f0af737fe3029943e0b9ab34cbbce54e27

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