Update Vagrantfile
Merge branch 'master' into v1.2.0