Merge features into master (was intended to: Merge master into features)#5874

nicoddemus merged 22 commits into

pytest-dev:masterpytest-dev/pytest:masterfrom

nicoddemus:mmnicoddemus/pytest:mmCopy head branch name to clipboard