Create more meaningful hostnames on virtual machines
Merge branch 'master' into pat