Merge branch 'MDL-31835_recent_conversations' of git://github.com/andyjdavis/moodle