From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2018 16:23:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1795'
X-Git-Tag: live~3116
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/475e40d21594ac67116c106036cd7e463b1d3509

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

475e40d21594ac67116c106036cd7e463b1d3509