Fix issue with disconnects
Modified fixes from Arcane.
Merge branch 'master' into development

Conflicts:
	Core/System.py