From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Jun 2019 17:58:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2256'
X-Git-Tag: live~2585
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5708c25e04a3d31796771fbcb44485bf601cec8b?hp=-c

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

5708c25e04a3d31796771fbcb44485bf601cec8b