Merge branch 'follow_and_unfollow_fix'