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