Merge branch 'accept-feedparser-encoding-override'