Merge "Fix warnings from build_sphinx"