52fc655 Auto-sync with upstream branch master

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