Don't forget about CLOEXEC
Merge branch 'master' into localhost_ping