Show status of master, not of branches
Restore VMWare support
Merge branch 'master' into even-lazier-resources
Remove stray prints