Merge pull request #1612 from esdrubal/socketsh