removed S() that causes exhaust of threads in mergeX
Merge branch 'refs/heads/mergex2' into nio/async-socket
Merge branch 'refs/heads/nio/async-socket' into spinoco/master