preVagrantUp
Merge origin/2.3 into 2.3

Conflicts:
	vagrant/preVagrantUp.sh