c177c3b Update to upstream 1.4.0

Authored and Committed by hguemar 8 years ago
    Update to upstream 1.4.0
    
        
file modified
+1 -0
file modified
+9 -7
file modified
+1 -1