Incorporate unmerged PRs from upstream#1

tpowell-progress merged 3 commits intomasterchef/ruby-shadow:masterfrom

tp/3.2-and-upchef/ruby-shadow:tp/3.2-and-upCopy head branch name to clipboard