95a8dfb Merge branch 'develop' into 'master' for release of 0.3.8

Merged and Committed by tflink 9 years ago
    Merge branch 'develop' into 'master' for release of 0.3.8
    
        
file modified
+2 -2
file modified
+5 -1
file modified
+1 -1