Merge branch 'MDL-26120_23' of https://github.com/jacks92/moodle into MOODLE_23_STABLE