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