753d5b7 Rebase to the latest upstream version

Authored and Committed by osloup 4 months ago
    Rebase to the latest upstream version
    
        
file modified
+1 -0
file modified
+5 -2
file modified
+1 -1