From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Aug 2018 07:42:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1959'
X-Git-Tag: live~2917
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f07af588e65076b6524a69b3951ca1ec2cedc334

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

f07af588e65076b6524a69b3951ca1ec2cedc334