fde5e92 Auto-sync with upstream branch master

Authored and Committed by fweimer 5 years ago
    Auto-sync with upstream branch master
    
    Upstream commit: ff6b24501f70da7d6375d6f5929262b9509db39e
    
        
file modified
+6 -2
file modified
+1 -1