Merge branch 'MDL-46753-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE