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

Trivial merge