976a6ca Auto-sync with upstream master

Authored and Committed by fweimer 6 years ago
    Auto-sync with upstream master
    
    Upstream commit: 4504783c0f65b7074204c6126c6255ed89d6594e
    
        
file modified
+6 -2
file modified
+1 -1