Daniel Hahler b5b710b3ae Merge master into features ... Several conflicts, mostly due to 2c402f4bd. Conflicts: .pre-commit-config.yaml src/_pytest/outcomes.py src/_pytest/python_api.py tox.ini		2019-08-02 16:52:51 +02:00
..
en	Merge master into features	2019-08-02 16:52:51 +02:00