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