From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 Dec 2018 15:49:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2087'
X-Git-Tag: live~2770
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5614c5a55127b86e8ffebdbd38279465f3795fe2?hp=876d150e577d27921e83fd54991ce5602e3f1430

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