Merge branch 'MDL-71305-311' of git://github.com/rezaies/moodle into MOODLE_311_STABLE