It is okay to use deprecated features in PHPUnit's own test suite
Merge branch '4.2'