Merge branch 'MDL-41402_master-fix-langstr' of git://github.com/dmonllao/moodle