Merge branch 'MDL-69392-310' of git://github.com/junpataleta/moodle into MOODLE_310_S...