Merge branch 'MDL-35007-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...