Merge branch 'master' into master-combined

Conflicts:
	config/kernel.m4
	man/man1/Makefile.am