Merge branch 'MDL-55504_no-phpunit-utils' of git://github.com/dmonllao/moodle