From: Tom Hughes <tom@compton.nu>
Date: Tue, 26 Mar 2019 21:11:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2168'
X-Git-Tag: live~2635
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c82fdf8e0fd4e5a8f2d831592d5e1fe13e1fe558?hp=-c

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

c82fdf8e0fd4e5a8f2d831592d5e1fe13e1fe558