Remove old virthost entries.
Merge branch 'master' into home