Fixes and upgrades with sphinx-2.0.6-release