Merge branch 'MDL-26439_message_search_23' of git://github.com/andyjdavis/moodle...