2b743b9 Auto-sync with upstream branch master

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