Merge branch 'm24_MDL-37844' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE