348539c Backport upstream patches to fix the build

Authored and Committed by kalev 6 years ago
    Backport upstream patches to fix the build
    
        
file modified
+5 -0