Merge branch 'MDL-71338' of git://github.com/paulholden/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 15 Apr 2021 06:42:10 +0000 (14:42 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 15 Apr 2021 06:42:10 +0000 (14:42 +0800)

Trivial merge