Minor updates for the MentionsAnnotator.
Merge branch 'master' of origin