Merge branch 'master_MDL-67502' of https://github.com/golenkovm/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 17 Dec 2019 05:36:44 +0000 (13:36 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 17 Dec 2019 05:36:44 +0000 (13:36 +0800)

Trivial merge