6714fc Backport a bunch of fixes

Authored and Committed by Zbigniew Jędrzejewski-Szmek 6 years ago
    Backport a bunch of fixes
    
        
file modified
+1 -1
file modified
+40 -8