Merge branch 'wip-MDL-36110-s23' of git://github.com/phalacee/moodle into MOODLE_23_S...