9c218c6 Rebase to the latest upstream version

Authored and Committed by osloup 5 months ago
    Rebase to the latest upstream version
    
        
file modified
+6 -3
file modified
+1 -1