[3.5] bpo-30380: Fix Sphinx 1.6.1 warnings. (GH-1613)#1615

brettcannon merged 2 commits intopython:3.5python/cpython:3.5from

serhiy-storchaka:backport-d97b7dc-3.5serhiy-storchaka/cpython:backport-d97b7dc-3.5Copy head branch name to clipboard