Sync with sebastianbergmann/phpunit@b8f8dd2