Fix for wrong PHPUnit version
Merge branch 'master' into composite