Merge master into features#5876

Closed

nicoddemus wants to merge 9 commits intopytest-dev:featuresfrom

Commits on Sep 20, 2019

Fix logging doc: change x.level to x.levelno
jamescooke
committed

Commits on Sep 21, 2019