Merge branch 'hotfix/sheldon'
New RSS feed URL for Sheldon
Merge branch 'hotfix/sheldon-feed' into develop