Merge branch 'MOODLE_310_MDL-47178' of https://github.com/golenkovm/moodle into MOODL...
authorJake Dallimore <jake@moodle.com>
Fri, 16 Oct 2020 03:52:29 +0000 (11:52 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 16 Oct 2020 03:52:29 +0000 (11:52 +0800)

Trivial merge