Merge pull request #3511 from henricm/fix-no-socket-reuse