Merge branch '4.2' into 4.3
Fix #1437: Risky test messages mask failures.
Merge branch '4.3'
Merge branch 'master' of git://github.com/sebastianbergmann/phpunit