Merge pull request #2121 from esdrubal/socketreuse