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

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

b15a8c73d9c555243952d300e19d6d4127843f19