Merge branch 'MDL-69529-master' of git://github.com/ilyatregubov/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 12 Jan 2021 08:40:26 +0000 (16:40 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 12 Jan 2021 08:40:26 +0000 (16:40 +0800)

Trivial merge