From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Apr 2018 16:38:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1838'
X-Git-Tag: live~3040
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/00425c8fcad370a7f596dafe8e188837fcb35130

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

00425c8fcad370a7f596dafe8e188837fcb35130