Fix issue with disconnects
Merge branch 'master' into development

Conflicts:
	Core/System.py
Fixed wtfery
Merge branch 'master' into development