Merge pull request #2903 from davilla/change-rss-urls