Sync with sebastianbergmann/phpunit@22e8879