From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Nov 2018 14:34:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2023'
X-Git-Tag: live~3914
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/16bef0c8ecad24ac0ca93963196bc844adbb57de?hp=16bef0c8ecad24ac0ca93963196bc844adbb57de

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