From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Jan 2019 10:20:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2115'
X-Git-Tag: live~2824
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d2e11a327eb686bd2d1293ac146a2bb9730ba19b?hp=--cc

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

d2e11a327eb686bd2d1293ac146a2bb9730ba19b