Merge master into features#2913

Merged

RonnyPfannschmidt merged 33 commits intopytest-dev:featuresfrom

nicoddemus:merge-master-into-features

Nov 11, 2017

Commits on Oct 23, 2017

Introduce a dedicated section about conftest.py
bilderbuchi
committed

Commits on Oct 24, 2017

Commits on Oct 25, 2017

Commits on Oct 28, 2017

Document pytest.param
dawranliou
committed

Commits on Oct 29, 2017

Fix context output handling for doctests
twmr
committed

Commits on Oct 30, 2017

Commits on Nov 3, 2017

Commits on Nov 4, 2017

Commits on Nov 9, 2017