Change to match add-sphinx-ext-docs branch