Merge branch 'MDL-69262-master-2' of git://github.com/junpataleta/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Sep 2020 21:42:45 +0000 (23:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Sep 2020 21:42:45 +0000 (23:42 +0200)

Trivial merge