28a1a66 Update to upstream 2.6.0

Authored and Committed by Alan Pevec 8 years ago
    Update to upstream 2.6.0
    
        
file modified
+1 -0
file modified
+11 -7
file modified
+1 -1