Merge branch 'MDL-25816_jabber_preference' of git://github.com/andyjdavis/moodle