Merge in 'scrounge-ntfs'.