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