fa55fd1 Update to upstream 2.5.0

Authored and Committed by pnemade 8 years ago
    Update to upstream 2.5.0
    
        
file modified
+1 -0
file modified
+59 -21
file modified
+1 -1