Merge branch 'mainline' into zfs