Merge branch 'MDL-35349_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE