89f0070 merge changes for 2.5.1

Merged and Committed by jamatos 9 years ago
    merge changes for 2.5.1
    
        
file modified
+2 -0
file modified
+35 -9
file modified
+1 -1