From: Tom Hughes <tom@compton.nu>
Date: Thu, 11 Oct 2018 16:41:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1955'
X-Git-Tag: live~2818
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/57095bc6c07056cb679087b3b3179404445b372e?ds=sidebyside

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

57095bc6c07056cb679087b3b3179404445b372e