Merge branch 'master_MDL-65116' of https://github.com/yao9394/moodle