Merge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle