Updated vagrant compatibility
Merge branch 'develop'

Conflicts:
	Common/Bootstrap.php