Merge Trond's nfs-for-next