a5d25ea Merge 0.8.8 from master

Merged and Committed by orion 11 years ago
    Merge 0.8.8 from master
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1