059710a Auto-sync with upstream release/2.26/master

Authored and Committed by fweimer 6 years ago
    Auto-sync with upstream release/2.26/master
    
    Upstream commit: 6043d77a47de297b62084c1c261cdada082bf09c
    
        
file modified
+7 -2
file modified
+1 -1