From: Tom Hughes <tom@compton.nu>
Date: Tue, 27 Feb 2018 20:22:15 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/1769'
X-Git-Tag: live~3140
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c819c8114d6e88f7e3a7ec4da93b4060e7aff3bc?hp=-c

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

c819c8114d6e88f7e3a7ec4da93b4060e7aff3bc