60efd15 Auto-sync with upstream branch master

Authored and Committed by Carlos O'Donell 5 years ago
    Auto-sync with upstream branch master
    
    Upstream commit: aa42b3dbcb0326badf377fec2c7fb2f34fdabecd
    
        
file removed
-25
file modified
+3 -3
file removed
-254
file modified
+10 -6
file modified
+1 -1