From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Nov 2018 21:22:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2044'
X-Git-Tag: live~2832
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a39c645602f9d27b7927500c93890f4d7d79620e?hp=a39c645602f9d27b7927500c93890f4d7d79620e

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