Merge pull request #4995 from annando/vanished-feeds