Merge branch 'MDL-34052-23' of https://github.com/damyon/moodle into MOODLE_23_STABLE