Backport accepted PRs to beta#26371

brson merged 3 commits intorust-lang:betarust-lang/rust:betafrom

alexcrichton:beta-backportalexcrichton/rust:beta-backportCopy head branch name to clipboard