edb6156 Auto-sync with upstream master

Authored and Committed by Carlos O'Donell 7 years ago
    Auto-sync with upstream master
    
    Upstream commit: 468e525c81a4af10f2e613289b6ff7c950773a9e
    
        
file removed
-2980
file modified
+12 -10
file modified
+1 -1