Merge remote branch 'origin/devel' into powerpc

Conflicts:
	auto/config
	config/amnesia
	config/chroot_local-hooks/51-module-assistant
	config/chroot_local-includes/etc/default/kexec
	config/chroot_local-includes/etc/memlockd.cfg