Merge branch 'MDL-69930-310' of https://github.com/HuongNV13/moodle into MOODLE_310_S...