a482017 Merge branch 'develop' into 'master' for 0.4.4.7 release

Merged and Committed by tflink 7 years ago
    Merge branch 'develop' into 'master' for 0.4.4.7 release
    
        
file modified
+5 -1
file modified
+1 -1
file modified
+17 -0
file modified
+7 -1
file modified
+1 -1
file modified
+2 -0
file modified
+4 -0
file modified
+1 -1
file modified
+2 -0