Merge branch 'master_MDL-66973' of https://github.com/golenkovm/moodle
authorJake Dallimore <jake@moodle.com>
Fri, 25 Oct 2019 03:09:49 +0000 (11:09 +0800)
committerJake Dallimore <jake@moodle.com>
Fri, 25 Oct 2019 03:09:49 +0000 (11:09 +0800)

Trivial merge