2ee609c 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: 5e989c36934d0f0cf13b7a53ef2fa440bce39210
    
        
file modified
+9 -2
file modified
+1 -1