From: Tom Hughes <tom@compton.nu>
Date: Sun, 15 Apr 2018 18:55:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1816'
X-Git-Tag: live~3106
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c174845258f8bb55d5fa969563604b14dedea210?hp=--cc

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

c174845258f8bb55d5fa969563604b14dedea210