From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Feb 2019 18:21:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2135'
X-Git-Tag: live~2679
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/77dcaef44c19d43a3944affbfcf2d037dc11aba5

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

77dcaef44c19d43a3944affbfcf2d037dc11aba5