From: Tom Hughes <tom@compton.nu>
Date: Thu, 2 Jan 2020 13:28:47 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2490'
X-Git-Tag: live~2373
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fa7ba58d5e22040f5e0d6c171bcceb59b58145ad

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

fa7ba58d5e22040f5e0d6c171bcceb59b58145ad