Client shuts down on Server shutdown
Merge remote-tracking branch 'origin/master'