From: Tom Hughes <tom@compton.nu>
Date: Thu, 23 Nov 2017 13:24:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1687'
X-Git-Tag: live~3833
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a2c7c09f7cdee569d5b8709c96aded33e398726b?hp=--cc

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

a2c7c09f7cdee569d5b8709c96aded33e398726b