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