Merge pull request #3838 from totten/master-phpunit-misc