Prepare for 1.7 prerelease
Merge branch 'vagrant-windows-1.7'