Merge branch 'MDL-41446-m24' of git://github.com/sammarshallou/moodle into MOODLE_24_...