Merge master into features (including fix from 4816)#4817

blueyed merged 21 commits into

pytest-dev:featurespytest-dev/pytest:featuresfrom

nicoddemus:merge-master-into-featuresnicoddemus/pytest:merge-master-into-featuresCopy head branch name to clipboard