Merge branch 'MDL-42839-m25' of git://github.com/sammarshallou/moodle into MOODLE_25_...