eaa5674 Auto-sync with upstream master

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream master
    
    Upstream commit: 9e78f6f6e7134a5f299cc8de77370218f8019237
    
        
file modified
+11 -2
file modified
+1 -1