574cbae Auto-sync with upstream master

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