Merge master into features

[blueyed]

No description provided.

[blueyed]

I've removed 2e2e895 in the merge commit - or should it be reverted instead?

[codecov]

Codecov Report

Merging #5332 into features will decrease coverage by 4.63%.
The diff coverage is 100%.

@@             Coverage Diff              @@
##           features    #5332      +/-   ##
============================================
- Coverage     92.87%   88.23%   -4.64%     
============================================
  Files           115      115              
  Lines         26264    26430     +166     
  Branches       2595     2639      +44     
============================================
- Hits          24392    23321    -1071     
- Misses         1548     2769    +1221     
- Partials        324      340      +16

Impacted Files	Coverage Δ
testing/conftest.py	100% <100%> (ø)	⬆️
testing/logging/test_reporting.py	21.03% <0%> (-78.97%)	⬇️
testing/test_warnings.py	26.77% <0%> (-72.14%)	⬇️
testing/test_runner_xunit.py	29.82% <0%> (-70.18%)	⬇️
testing/examples/test_issue519.py	33.33% <0%> (-66.67%)	⬇️
testing/test_runner.py	34.7% <0%> (-52.72%)	⬇️
testing/test_pdb.py	47.55% <0%> (-50.89%)	⬇️
testing/test_session.py	53.79% <0%> (-46.21%)	⬇️
testing/test_tmpdir.py	75.8% <0%> (-17.75%)	⬇️
testing/python/fixtures.py	70.33% <0%> (-9.51%)	⬇️
... and 21 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5bc3ad8...af21e6b. Read the comment docs.

[nicoddemus]

Probably reverted, I suspect if one attempts to merge it again, that commit will again be a merge candidate

[blueyed]

A revert would be cleaner (it would also be reverted on master when merging it back), but that also works with the merge commit - where I've done it initially since it caused a conflict right there.

I think it is good like this.