From: Tom Hughes <tom@compton.nu>
Date: Wed, 5 Sep 2018 17:41:17 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1972'
X-Git-Tag: live~2898
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a0dc300840c236d6460c0641f8a9f47246815ad1?hp=a0dc300840c236d6460c0641f8a9f47246815ad1

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