Merge branch 'MDL-34250_23' of github.com:stronk7/moodle into MOODLE_23_STABLE