Merge pull request #3750 from marek-safar/socket