Merge branch 'MDL-69877-master' of git://github.com/mickhawkins/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 14 Jan 2021 06:51:46 +0000 (14:51 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 14 Jan 2021 06:51:46 +0000 (14:51 +0800)

Trivial merge