Further work on unix_drive.
Merge remote-tracking branch 'origin/fuse' into next