Merge branch 'master' into issue116

Conflicts:
	cmd/zpool/zpool_main.c
	include/sys/zfs_vfsops.h
	lib/libzfs/libzfs_dataset.c