From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Jan 2020 10:31:37 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2498'
X-Git-Tag: live~2870
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e39d227dd03f43985e38cd26ce6040772d571271?hp=--cc

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

e39d227dd03f43985e38cd26ce6040772d571271