Merge branch 'master_MDL-69848' of https://github.com/golenkovm/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 14 Oct 2020 01:41:39 +0000 (09:41 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 14 Oct 2020 01:41:39 +0000 (09:41 +0800)

Trivial merge