Merge branch 'MDL-28187_messaging_nav' of git://github.com/andyjdavis/moodle