From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Jan 2019 11:39:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2117'
X-Git-Tag: live~2804
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a7628a942bf953ef338f9b8911f8174c3740945b?hp=-c

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

a7628a942bf953ef338f9b8911f8174c3740945b