4ecc1e8 Apply upstream patch (PR#3022) for issue #3021

Authored and Committed by music 2 years ago
    Apply upstream patch (PR#3022) for issue #3021
    
        
file added
+39
file modified
+8 -19