From: Tom Hughes <tom@compton.nu>
Date: Wed, 6 Jun 2018 13:30:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1894'
X-Git-Tag: live~2998
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3da3b93f80592c03fdf17872b7c64ebcc9941a7a?hp=-c

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

3da3b93f80592c03fdf17872b7c64ebcc9941a7a