Rebase client-connection on master

At the request of @Zidane

Unfortunately, the rebase ate all the PR merges. If you want me to instead do a merge commit, let me know.