From: Tom Hughes <tom@compton.nu>
Date: Wed, 25 Apr 2018 16:37:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1836'
X-Git-Tag: live~3074
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/0d7c9a187e23ded9c7500851075868c3c038773b?hp=0d7c9a187e23ded9c7500851075868c3c038773b

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