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