Merge branch 'MDL-67504-Master' of https://github.com/tuanngocnguyen/moodle