events rss
Merge branch 'enhancements'
resolved events feed conflicts