Merge branch 'MDL-69422-master-2' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 07:58:21 +0000 (15:58 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 22 Dec 2020 07:58:21 +0000 (15:58 +0800)

Trivial merge