PHPUnit_MockObject 2.0 and up do not have __phpunit_cleanup() anymore
Merge branch '4.0' into 4.1
Merge branch '4.1'