Added better temp settings for the vm.
Merge branch 'test' into dev