Merge pull request #3059 from octo/sock_cloexec