589518d Auto-sync with upstream branch master

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