82db948 Auto-sync with upstream master

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