Fix teardown error#101

Dreamsorcerer wants to merge 3 commits into

pytest-dev:masterpytest-dev/pytest-forked:masterfrom

Dreamsorcerer:patch-1Dreamsorcerer/pytest-forked:patch-1Copy head branch name to clipboard