From: Tom Hughes <tom@compton.nu>
Date: Thu, 29 Jun 2017 07:58:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1561'
X-Git-Tag: live~3351
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1b7586c9288d694b2bc443d62f3c40502868ff77?hp=-c

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

1b7586c9288d694b2bc443d62f3c40502868ff77