From: Tom Hughes <tom@compton.nu>
Date: Sun, 25 Mar 2018 13:27:16 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1788'
X-Git-Tag: live~3123
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1a2bdacf1769d3157b895b662b6e43a2aa59d9e6?hp=-c

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

1a2bdacf1769d3157b895b662b6e43a2aa59d9e6