more feed updates
Merge branch 'master' into develop