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