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