From: Tom Hughes <tom@compton.nu>
Date: Thu, 27 Jul 2017 18:18:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1595'
X-Git-Tag: live~3310
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/555a821c3e1b79093b63b96e981c4766cf43baa9

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

555a821c3e1b79093b63b96e981c4766cf43baa9