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