Merge pull request #2351 from ludovic-henry/fix-socket-36941