Merge branch 'MDL-68070-38_messaging_fix' of https://github.com/beenet-dev/moodle...