Spread some @covers annotation goodness around
Merge branch '4.0' into 4.1