From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Jul 2017 16:53:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1583'
X-Git-Tag: live~3925
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/39c5d8caa71b29d70bb136d6e0a560426e089112

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

39c5d8caa71b29d70bb136d6e0a560426e089112