cc6a9f2 Add two cherry-picked patches from upstream

Authored and Committed by besser82 6 years ago
    Add two cherry-picked patches from upstream
    
        
file modified
+11 -2