Merge remote-tracking branch 'upstream/master'

diff --cc src/librustpkg/conditions.rs
Simple merge

diff --cc src/librustpkg/util.rs
Simple merge

diff --cc src/libstd/rt/io/file.rs
Simple merge

diff --cc src/libstd/rt/io/mod.rs
Simple merge

diff --cc src/libstd/rt/uv/uvio.rs
Simple merge

diff --cc src/libstd/run.rs
Simple merge