Tweak phpunit.xml.dist
Merge remote-tracking branch 'origin/master'