Merge branch 'MDL-34916_M23' of git://github.com/kordan/moodle into MOODLE_23_STABLE