Update Vagrant to 1.6.0
Merge pull request #4233 from yveslaroche/master

Update Vagrant to 1.6.0