Update pytest to 3.6.3#302

guykisel merged 2 commits intomasterguykisel/inline-plz:masterfrom

pyup-update-pytest-3.5.1-to-3.6.3guykisel/inline-plz:pyup-update-pytest-3.5.1-to-3.6.3Copy head branch name to clipboard