cc872b9 Merge branch 'develop' into 'master' for 0.3.22 release

Merged and Committed by tflink 8 years ago
    Merge branch 'develop' into 'master' for 0.3.22 release
    
        
file modified
+3 -5
file modified
+2 -2
file modified
+7 -3
file modified
+1 -1
file modified
+14 -19
file modified
+3 -2
file modified
+1 -2
file modified
+2 -0
file modified
+20 -20
file modified
+49 -39