From: Tom Hughes <tom@compton.nu>
Date: Thu, 15 Sep 2016 18:21:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1285'
X-Git-Tag: live~3781
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/19a9298855028b3edb95428d34470f45c92ce8d9?hp=19a9298855028b3edb95428d34470f45c92ce8d9

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