Merge branch 'MDL-71064' of git://github.com/paulholden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Apr 2021 15:32:24 +0000 (17:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Apr 2021 15:32:24 +0000 (17:32 +0200)

Trivial merge