5d3418f Patch the patches

Authored and Committed by gui1ty 7 months ago
    Patch the patches
    
    - Backport patches from master not in v6.0.0a2
    
    Cherry picked PR merges from master.
    
        
file modified
+14 -21
file modified
+7 -29
file modified
+4 -12