Merge branch 'MDL-46175_strings' of https://github.com/andyjdavis/moodle