From: Tom Hughes <tom@compton.nu>
Date: Mon, 6 Feb 2017 19:10:25 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1426'
X-Git-Tag: live~3648
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/333113b8e11004903577507084ecfba85b8f7f53

Merge remote-tracking branch 'openstreetmap/pull/1426'
---

333113b8e11004903577507084ecfba85b8f7f53