Merge pull request #6909 from annando/fix-mentions