Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle