f0k Merge pull request #921 from f0k/fix-pytest-cfg