Merge branch 'pnfs_generic'