Merge ref 'd350797b7e1a' from rust-lang/rust

Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: d350797b7e1a5b6952f5035cbad2a21613b32f6c
Filtered ref: b92cdb5

This merge was created using https://github.com/rust-lang/josh-sync.

Author: The rustc-josh-sync Cronjob Bot