Beta backport#26436

alexcrichton merged 2 commits intorust-lang:betarust-lang/rust:betafrom

brson:beta-backportbrson/rust:beta-backportCopy head branch name to clipboard