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