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~2572
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/5708c25e04a3d31796771fbcb44485bf601cec8b?hp=ff61da4e5fc85eb12a8ff8ec701b11f1443fe1a9

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