Ignore output-vmware-* folders.
Merge branch 'master' into feature/windows-server-2008-r2