Merge pull request #1153 from mbethke/fix-unixsock