Merge pull request #2349 from rust-lang/rustc-pull

Rustc pull update