4f53fe4 Auto-sync with upstream master

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