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