Merge branch 'master-MDL-67467' of https://github.com/yao9394/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 30 Dec 2019 01:59:20 +0000 (09:59 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 30 Dec 2019 01:59:20 +0000 (09:59 +0800)

Trivial merge