Revert "Merge master into features (#5874)"#5877

nicoddemus wants to merge 1 commit intopytest-dev:masterpytest-dev/pytest:masterfrom

nicoddemus:revert-bad-mergenicoddemus/pytest:revert-bad-mergeCopy head branch name to clipboard