Merge branch 'master' into rusty-hermit

diff --cc Cargo.lock
Simple merge

diff --cc src/bootstrap/lib.rs
Simple merge

diff --cc src/librustdoc/clean/cfg.rs
Simple merge

diff --cc src/libstd/Cargo.toml
Simple merge

diff --cc src/libstd/sys/unix/fs.rs
Simple merge

diff --cc src/libtest/lib.rs
Simple merge