f9af88 Adds some important patches from upstream

Authored and Committed by bmbouter 3 years ago
    Adds some important patches from upstream
    
    - Adds patch to fix upstream issue 569
    - Adds patch to fix upstream issue 571
    
        
file added
+37
file added
+114
file modified
+9 -1