Merge "Fix Sphinx version"