Fix Pytest4.x compatibility errors#222

stanislavlevin wants to merge 1 commit intopytest-dev:masterpytest-dev/py:masterfrom

stanislavlevin:fix_pytest4.x_compatstanislavlevin/py:fix_pytest4.x_compatCopy head branch name to clipboard