971c8f Upstream 2.0.0

Authored and Committed by hguemar 2 years ago
    Upstream 2.0.0
    Drop upstreamed patch
    
        
file modified
+7 -6