Merge branch 'MDL-31708-moodle23' of git://github.com/StudiUM/moodle into MOODLE_23_S...