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