5bc3170 Auto-sync with upstream release/2.25/master

Authored and Committed by fweimer 7 years ago
    Auto-sync with upstream release/2.25/master
    
    Upstream commit: 93cf93e06ce123439e41d3d62790601c313134cb
    
        
file modified
+9 -2
file modified
+1 -1