Merge branch 'MDL-69649-310' of git://github.com/rezaies/moodle into MOODLE_310_STABLE