Merge remote-tracking branch 'openstreetmap/pull/1351'
authorTom Hughes <tom@compton.nu>
Sun, 30 Oct 2016 16:57:35 +0000 (16:57 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 30 Oct 2016 16:57:35 +0000 (16:57 +0000)

Trivial merge