From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Apr 2018 16:37:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1834'
X-Git-Tag: live~3071
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c783b5c82f5242dcc274bbae00ca2af9b537d724?hp=c783b5c82f5242dcc274bbae00ca2af9b537d724

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