ace066c Auto-sync with upstream master

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