Spelling and grammar fixes#4264

nicoddemus merged 2 commits intopytest-dev:masterpytest-dev/pytest:masterfrom

scop:spelling2scop/pytest:spelling2Copy head branch name to clipboard