c8684b8 Replace downstream patch with upstream change

Authored and Committed by pemensik 4 years ago
    Replace downstream patch with upstream change
    
    Actually merged fix is a bit different.
    
        
file modified
+54 -21