Merge branch 'MDL-37161-moodle23' of https://github.com/StudiUM/moodle into MOODLE_23...