Merge branch 'MDL-35385_chat_23' of git://github.com/andyjdavis/moodle into MOODLE_23...