Merge branch 'MDL-68477-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 21:30:09 +0000 (23:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Apr 2020 21:30:09 +0000 (23:30 +0200)

Trivial merge