b766add Auto-sync with upstream master

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