2fed843 Rebase to 2.7.2.

Authored and Committed by adelton a month ago
    Rebase to 2.7.2.
    
        
file modified
+3 -0
file modified
+1 -15
file modified
+1 -1