Merge branch 'sphinx-python3' into release
Merge branch 'release'
Merge branch 'master' into next