Merge branch 'wip-MDL-36335-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE