Merge remote-tracking branch 'upstream/master' into py2-to-3

Author: offbyone

config/config.ini

@@ -243,7 +243,7 @@ name = Chris Mitchell
 [http://pbpython.com/feeds/all.atom.xml]
 name = Chris Moffitt
 
-[http://ideas.offby1.net/feeds/tag-python.atom.xml]
+[http://offby1.website/feeds/tag-python.atom.xml]
 name = Chris Rose
 
 [http://feeds.feedburner.com/ChrisWarrickPython]
@@ -795,6 +795,9 @@ name = Marc-André Lemburg
 [http://www.grulic.org.ar/~mdione/glob/categories/python.xml]
 name = Marcos Dione
 
+[https://mariatta.ca/tags/python/index.xml]
+name = Mariatta
+
 [http://mg.pov.lt/blog/index.xml]
 name = Marius Gedminas
 
@@ -1080,6 +1083,9 @@ name = PyCon
 [https://www.pygame.org/news/feed/atom]
 name = pygame
 
+[https://pypodcats.live/episodes/index.xml]
+name = PyPodcats
+
 [https://www.pypy.org/rss.xml]
 name = PyPy
 
@@ -1113,6 +1119,9 @@ name = Python Data
 [http://www.pythondiary.com/blog.xml]
 name = Python Diary
 
+[https://python.github.io/editorial-board/index.xml]
+name = Python Docs Editorial Board
+
 [http://pythondoeswhat.blogspot.com/feeds/posts/default]
 name = Python Does What?!