Merge remote-tracking branch 'origin/devel' into vagrant
 Give VM 1/4 system memory & access to all cpu cores on the host
Merge remote-tracking branch 'origin/vagrant' into vagrant

Conflicts:
	Vagrantfile