Merge branch 'MDL-62945-master' of https://github.com/HuongNV13/moodle