Fix phpunit and virtualmachine
Merge remote-tracking branch 'origin/master' into 0.85+tasks_redux