Merge branch 'phpunit-4.0-fix'