Edit Vagrant file.
Merge remote-tracking branch 'origin/master'
Edit Vagrant file.