Merge branch 'hotfix/portkill'
Always use connect on the worker, always use bind on the master
Merge branch 'hotfix/clientfix' into develop