Collapsing EventDrivenTcpServer branch to master