Merge branch 'MDL-23545-phpunit-fixes' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 22:26:25 +0000 (00:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2018 22:26:25 +0000 (00:26 +0200)

Trivial merge