5617e2c Auto-sync with upstream master

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