e20090 Rebase to v2.6.0 GA

Authored and Committed by crobinso 8 years ago
    Rebase to v2.6.0 GA
    
        
file modified
+6 -2
file modified
+1 -1