643cad6 Merge branch 'develop' into 'master' for 0.4.17 release

Merged and Committed by tflink 7 years ago
    Merge branch 'develop' into 'master' for 0.4.17 release
    
        
file modified
+6 -0
file modified
+1 -1
file modified
+2 -1
file modified
+9 -4
file modified
+1 -1
file modified
+7 -3
file modified
+42 -0
file modified
+25 -48
file modified
+2 -2
file modified
+47 -28
file modified
+13 -3
file modified
+1 -3
file modified
+41 -82