From: Tom Hughes <tom@compton.nu>
Date: Wed, 12 Oct 2016 18:11:07 +0000 (+0100)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1309'
X-Git-Tag: live~3763
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e96f1e736a462bdf1ce1304ed870fe57ff0e4caf

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

e96f1e736a462bdf1ce1304ed870fe57ff0e4caf