69ce1bc Merge branch 'develop' into 'master' to fix 0.4.4 release

Merged and Committed by tflink 9 years ago
    Merge branch 'develop' into 'master' to fix 0.4.4 release
    
        
file modified
+6 -6
file modified
+1 -1