f21f7f7 Auto-sync with upstream branch master

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