Fix #81 for the master branch.

Sync sebastianbergmann/phpunit@5582d3a.

The tests for this fix are already in the master branch.