Merge remote-tracking branch 'openstreetmap/pull/1078'
authorTom Hughes <tom@compton.nu>
Mon, 26 Oct 2015 15:51:59 +0000 (15:51 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 26 Oct 2015 15:51:59 +0000 (15:51 +0000)

Trivial merge