Merge remote-tracking branch 'openstreetmap/pull/1068'
authorTom Hughes <tom@compton.nu>
Mon, 12 Oct 2015 20:15:47 +0000 (21:15 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 12 Oct 2015 20:15:47 +0000 (21:15 +0100)

Trivial merge