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