Merge branch 'MDL-41672-text-mail-links' of git://github.com/mudrd8mz/moodle