Merge branch 'maint' into next

Conflicts:

	configure
	lib/ext2fs/ext2_fs.h
	misc/e2image.c