5ca0400 Auto-sync with upstream branch master

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