Merge branch 'MDL-30022_message_duplicate_23' of git://github.com/andyjdavis/moodle...