bf5d10e Merge branch 'develop' into 'master' for 0.3.17 release

Merged and Committed by tflink 8 years ago
    Merge branch 'develop' into 'master' for 0.3.17 release
    
        
file modified
+2 -0
file removed
-92
file modified
+7 -6
file modified
+17 -2
file modified
+2 -2
file modified
+2 -1
file modified
+2 -1
file modified
+7 -6
file added
+167
file modified
+4 -1
file modified
+1 -1
file modified
+40 -24
file modified
+26 -4
file modified
+28 -3
file modified
+27 -0
file modified
+13 -1