From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Feb 2019 18:30:41 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2136'
X-Git-Tag: live~2731
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/908324323e8801ff76a7cde812e61dbbb03a33ce

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

908324323e8801ff76a7cde812e61dbbb03a33ce