Merge branch 'MDL-63806-master' of git://github.com/jleyva/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Oct 2020 20:26:27 +0000 (22:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Oct 2020 20:26:27 +0000 (22:26 +0200)

Trivial merge