Comment Upvotes fix
Merge remote-tracking branch 'origin/pika_comments_email' into pika_comments_email