c097c5b Auto-sync with upstream master

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