Merge master into features#6457

blueyed wants to merge 10 commits intopytest-dev:featurespytest-dev/pytest:featuresfrom

blueyed:merge-master-into-featuresblueyed/pytest:merge-master-into-featuresCopy head branch name to clipboard