77d2ac8 Auto-sync with upstream master

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