Merge branch 'MDL-71874-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Jul 2021 18:38:01 +0000 (20:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Jul 2021 18:38:01 +0000 (20:38 +0200)

Trivial merge