Merge remote branch 'origin/master'

Merge remote branch 'origin/master'

Conflicts:
	tests/ts/blkid/images-fs/adaptec-raid.img.bz2
	tests/ts/blkid/images-fs/ddf-raid.img.bz2
	tests/ts/blkid/images-fs/gfs2.img.bz2
	tests/ts/blkid/images-fs/hpt37x-raid.img.bz2
	tests/ts/blkid/images-fs/isw-raid.img.bz2
	tests/ts/blkid/images-fs/jbd.img.bz2
	tests/ts/blkid/images-fs/jmicron-raid.img.bz2
	tests/ts/blkid/images-fs/lvm2.img.bz2
	tests/ts/blkid/images-fs/nvidia-raid.img.bz2
	tests/ts/blkid/images-fs/ocfs2.img.bz2
	tests/ts/blkid/images-fs/promise-raid.img.bz2
	tests/ts/blkid/images-fs/reiser4.img.bz2
	tests/ts/blkid/images-fs/romfs.img.bz2
	tests/ts/blkid/images-fs/silicon-raid.img.bz2
	tests/ts/blkid/images-fs/swap0.img.bz2
	tests/ts/blkid/images-fs/swap1.img.bz2
	tests/ts/blkid/images-fs/via-raid.img.bz2
	tests/ts/blkid/images-fs/vmfs_volume.img.bz2
	tests/ts/blkid/images-fs/zfs.img.bz2