From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Nov 2018 11:54:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2073'
X-Git-Tag: live~3846
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aaf56003427cfcbd89fda0847726fd0baa34050c?hp=8f70fb21146b1e8b90125e02d54e70bceea1d5fd

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