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