From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Feb 2019 18:17:03 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2134'
X-Git-Tag: live~2686
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/43c09d8062fc4aef4f1e0e5d3598e526a02bb288?hp=--cc

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

43c09d8062fc4aef4f1e0e5d3598e526a02bb288