Merge branch 'MDL-71796-master' of git://github.com/lameze/moodle
authorIlya Tregubov <ilya@moodle.com>
Mon, 5 Jul 2021 10:32:09 +0000 (12:32 +0200)
committerIlya Tregubov <ilya@moodle.com>
Mon, 5 Jul 2021 10:32:09 +0000 (12:32 +0200)

Trivial merge