Merge branch 'master' into markj-kernel-config
Merge branch 'markj-kernel-config' of github.com:markjdb/freebsd into markj-kernel-config
Build vmm.
Merge branch 'markj-kernel-config' into markj-develop

Conflicts:
	sys/amd64/conf/MARKJ