Merge branch 'master_MDL-64610' of https://github.com/golenkovm/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 6 Jan 2020 02:50:36 +0000 (10:50 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 6 Jan 2020 02:50:36 +0000 (10:50 +0800)

Trivial merge