b930f8d 1370828 - Rebase to upstream version 1.26.

Authored and Committed by adelton 7 years ago
    1370828 - Rebase to upstream version 1.26.
    
        
file modified
+1 -0
file modified
+7 -4
file modified
+1 -1