Merge branch 'MDL-27823_bulk_messaging_2' of git://github.com/andyjdavis/moodle