Merge branch 'MDL-32245_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE