Improved handling of systems with a bad hypervisor.
Merge branch 'test' into dev