From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Jan 2019 10:23:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2116'
X-Git-Tag: live~2711
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/11806a676fb88f51ece004b7c05bde38f1e77706

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

11806a676fb88f51ece004b7c05bde38f1e77706