Sync sebastianbergmann/phpunit@5582d3a.
Merge pull request #118 from whatthejeff/issue_81_master