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