c8098b8 Auto-sync with upstream branch master

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