Merge pull request #3863 from jow-/socat-fix-build