Merge branch 'MDL-67296-master' of git://github.com/vmdef/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jan 2020 22:46:06 +0000 (23:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jan 2020 22:46:06 +0000 (23:46 +0100)

Trivial merge