Merge from master#3634

nicoddemus merged 6 commits intopytest-dev:featurespytest-dev/pytest:featuresfrom

RonnyPfannschmidt:merge-from-masterRonnyPfannschmidt/pytest:merge-from-masterCopy head branch name to clipboard