Set default timeout on the server socket
Merge branch 'master' into join
localize the timeout
Merge pull request #268 from kevinburke/join

Set default timeout on the server socket