Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle