Merge remote-tracking branch 'origin/master' into client-connection
Cleanup and some documentation of ServerNetworkSynchronizer

Signed-off-by: Jack Huey kitskub@gmail.com