Merge branch 'MDL-70009-310' of git://github.com/ilyatregubov/moodle into MOODLE_310_...