Merge master into features#3949

RonnyPfannschmidt merged 10 commits intopytest-dev:featurespytest-dev/pytest:featuresfrom

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