Merge branch 'master' into forkbomb

Conflicts:
	modprobe.c