From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Feb 2018 16:12:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1693'
X-Git-Tag: live~3191
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/9d2f920feb9dce028b985e8d452538d3df7a1d9c

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

9d2f920feb9dce028b985e8d452538d3df7a1d9c