Merge branch 'maint' into next

Conflicts:

	lib/ext2fs/closefs.c