Merge pull request #13541 from ja-pa/pytest-6.1.0