From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Apr 2018 18:37:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1809'
X-Git-Tag: live~3036
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/8bd001f1282b7a33a71c0565504e160dbe567d5d

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

8bd001f1282b7a33a71c0565504e160dbe567d5d