Merge branch 'MDL-22937_message_html2' of git://github.com/andyjdavis/moodle