Merge "Include author attributes in CommentPanel."