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