Merge branch 'master-MDL-67524' of https://github.com/yao9394/moodle