Merge branch 'master' into 20141106-kernel-dump-refactoring

Conflicts:
	sys/kern/kern_fork.c
	sys/kern/kern_shutdown.c
	sys/sys/conf.h
Merge branch '20141106-kernel-dump-refactoring' into markj-develop

Conflicts:
	sys/sys/kerneldump.h