Merge branch 'master' into totalW

Conflicts:
	jumpgate/compute/drivers/sl/servers.py
	tests/jumpgate-tests/compute/test_servers.py