From: Tom Hughes <tom@compton.nu>
Date: Mon, 28 Jan 2019 22:57:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2123'
X-Git-Tag: live~2701
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/cf57e195f2776475f040cad5f937249c3bcdcf2b?hp=-c

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

cf57e195f2776475f040cad5f937249c3bcdcf2b