No more
Merge branch 'master' into disconnect-improvements

Conflicts:
	server/lib/Client.cpp