[6.2.x] Merge pull request #8540 from hauntsaninja/assert310#8630

nicoddemus wants to merge 1 commit intopytest-dev:6.2.xpytest-dev/pytest:6.2.xfrom

nicoddemus:backport-8540nicoddemus/pytest:backport-8540Copy head branch name to clipboard