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

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