rss typo
other fix
Merge branch 'master' into develop