890cc4e Auto-sync with upstream branch master

Authored and Committed by fweimer 6 years ago
    Auto-sync with upstream branch master
    
    Upstream commit: bd60ce86520b781ca24b99b2555e2ad389bbfeaa
    
        
file removed
-91
file modified
+18 -90
file modified
+12 -12
file modified
+10 -5