From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Oct 2018 17:59:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2014'
X-Git-Tag: live~2856
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b8a8a88004d25837a10436fdc13128146b32c32b?hp=b8a8a88004d25837a10436fdc13128146b32c32b

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