Merge pull request #6846 from annando/fix-mentions