From: Tom Hughes <tom@compton.nu>
Date: Wed, 20 Feb 2019 23:57:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2152'
X-Git-Tag: live~3767
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f8a71ffb30ee03a05f6284dd8aa722f9b6771ac6?hp=f86bb781c9e2f93f7f3a5b638bfc9c3d32160129

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