Merge branch 'jn/webfeed'