38d7cff Backport a bunch of patches

Authored and Committed by zbyszek 6 years ago
    Backport a bunch of patches
    
        
file modified
+1 -1
file modified
+9 -3