82458f6 Merge branch 'develop' into 'master' for 0.3.14 release

Merged and Committed by tflink 8 years ago
    Merge branch 'develop' into 'master' for 0.3.14 release
    
        
file modified
+4 -4
file modified
+3 -3
file modified
+1 -1
file modified
+9 -1
file modified
+1 -1
file modified
+12 -2
file modified
+12 -3
file modified
+12 -2
file modified
+5 -3
file modified
+1 -1
file modified
+17 -4