Merge from vagrant-vsphere base tree 2014/11/05