Merge master into features#5921

blueyed wants to merge 30 commits into

pytest-dev:featurespytest-dev/pytest:featuresfrom

blueyed:mmblueyed/pytest:mmCopy head branch name to clipboard