Merge branch 'MDL-37919-phpunit-exception' of git://github.com/mudrd8mz/moodle