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