Merge branch 'MDL-70271-master' of git://github.com/peterRd/moodle
authorIlya Tregubov <ilya@moodle.com>
Fri, 30 Jul 2021 10:24:35 +0000 (12:24 +0200)
committerIlya Tregubov <ilya@moodle.com>
Fri, 30 Jul 2021 10:24:35 +0000 (12:24 +0200)

Trivial merge