fixes to atom feeds
Merge branch 'master' into local