Merge branch 'master' into bae

Conflicts:
	maclient_network.py