Merge pull request #761 from jmaas/release24

Improve support for VMware with updated sources