Merge master into features#5339

nicoddemus merged 11 commits into

pytest-dev:featurespytest-dev/pytest:featuresfrom

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