Merge branch 'MDL-42382-master' of git://github.com/NoelDeMartin/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 25 Nov 2020 21:42:16 +0000 (22:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:46:10 +0000 (12:46 +0100)

Trivial merge