From: Tom Hughes <tom@compton.nu>
Date: Sun, 30 Oct 2016 16:59:20 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1352'
X-Git-Tag: live~4791
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/fc0aebc1a8ccad4ae9a3ac6435df00328e5a98e5?ds=inline;hp=fc0aebc1a8ccad4ae9a3ac6435df00328e5a98e5

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