5c7382 apply new bugfixes from upstream 1.1.1 branch

Authored and Committed by tmraz 5 months ago
    apply new bugfixes from upstream 1.1.1 branch
    
        
file modified
+30 -0
file modified
+6 -3