be6211a Auto-sync with upstream release/2.24/master

Authored and Committed by Carlos O'Donell 7 years ago
    Auto-sync with upstream release/2.24/master
    
    Upstream commit: e9e69e468039fcd57276f783a16aa771a8e4214e
    
        
file modified
+18 -15
file modified
+15 -2
file modified
+2 -1
file modified
+1 -1