From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Nov 2018 18:09:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2074'
X-Git-Tag: live~3853
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6213592a6a4e90df4008f6549bbea334cd19e816?hp=3fd083d9d4f3c266ad9bc8bbf337f44c184d15a2

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