04b4101 Auto-sync with upstream master

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