cee352f Auto-sync with upstream branch master

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