Merge branch 'MDL-68797-master' of https://github.com/nguyenphuctien/moodle