Changes to the client connection handling.
More changes to the client connection handling.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013.git