Fixed minor issue with new / latest comment stuff
Merge branch 'latest_comment_issue' into develop