Merge branch 'master' into markj-kernel-config
bhyve config for i386.
Merge branch 'markj-kernel-config' into markj-develop