merge client-connection on master

At the request of @Zidane and @Afforess