Rebase for gankro#28797

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

steveklabnik:rebase_for_gankrosteveklabnik/rust:rebase_for_gankroCopy head branch name to clipboard