From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 May 2019 13:36:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2232'
X-Git-Tag: live~2612
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/ea68ac865ba4df5686ac111d4bd8679dc2a643a8

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

ea68ac865ba4df5686ac111d4bd8679dc2a643a8