Ended connection to the server properly.
Merge remote-tracking branch 'origin/master' into clientdebugger