Merge branch 'master' into master

Cargo.toml

libc-test/Cargo.lock

src/lib.rs

src/unix/bsd/apple/mod.rs

src/unix/mod.rs

src/unix/notbsd/android/mod.rs

src/unix/notbsd/linux/mod.rs

src/unix/notbsd/linux/other/mod.rs

src/unix/solaris/mod.rs