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