Merge "Sync Sphinx requirement"