Ended connection to the server properly.
Merge branch 'master' into clientdebugger