Fork of open-vm-tools-9.4.6-1770165 from http://http://sourceforge.net/projects/open-vm-tools.
Merge remote-tracking branch 'origin/master'