0c17b02 Update to upstream

Merged and Committed by Jan ONDREJ (SAL) 2 years ago
    Update to upstream
    Change dependencies according to upstream
    
        
file modified
+7 -6