Merge branch 'MDL-70480-311' of https://github.com/chanqihui/moodle into MOODLE_311_S...