4570c40 Auto-sync with upstream master

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