Merge "Fix sphinx warnings"