Merge pull request #4156 from dokuwiki/feedrefactor