Merge branch 'MDL-28087_friendly_jabber' of git://github.com/andyjdavis/moodle