Merge branch 'MDL-40439-en_fix_24' of git://github.com/mudrd8mz/moodle into MOODLE_24...