From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Sep 2018 18:01:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1973'
X-Git-Tag: live~3955
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/70cca71f3802519eac1fabaeb3ee1cc9f35f5cb7?hp=70cca71f3802519eac1fabaeb3ee1cc9f35f5cb7

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