2f5ed89 rebase to 1.4.0

Authored and Committed by patches 9 years ago
    rebase to 1.4.0
    
        
file modified
+1 -0
file modified
+1 -1
file modified
+12 -50
file modified
+1 -1