Merge pull request #8130 from pytest-dev/release-6.2.0#8131

bluetech merged 1 commit intopytest-dev:masterpytest-dev/pytest:masterfrom

bluetech:cherry-pick-releasebluetech/pytest:cherry-pick-releaseCopy head branch name to clipboard