From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2018 16:38:34 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1799'
X-Git-Tag: live~3129
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/357de642b32520cc6a899384b1f8ad078dc479b1

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

357de642b32520cc6a899384b1f8ad078dc479b1