Merge branch 'MDL-70093-master' of https://github.com/golenkovm/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 4 Nov 2020 01:00:05 +0000 (09:00 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 4 Nov 2020 01:00:05 +0000 (09:00 +0800)

Trivial merge