Better handling of stopped VM's.
Merge branch 'test' into dev