Merge pull request #2047 from esdrubal/socketreuse