From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 May 2019 16:37:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2238'
X-Git-Tag: live~2597
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7fc00c9314b6d774616ec9bb298f7a4dd2c63b8d?hp=-c

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

7fc00c9314b6d774616ec9bb298f7a4dd2c63b8d