be485b2 Merge branch 'develop' into 'master' for 0.4.10 release

Merged and Committed by mkrizek 8 years ago
    Merge branch 'develop' into 'master' for 0.4.10 release
    
        
file modified
+12 -3
file modified
+17 -1
file modified
+2 -2
file modified
+1 -1
file modified
+6 -0
file modified
+1 -1
file modified
+4 -1
file modified
+1 -1
file modified
+12 -0
file modified
+3 -7
file modified
+29 -17
file modified
+48 -16
file modified
+62 -2
file modified
+121 -97
file modified
+1 -1
file modified
+15 -18
file modified
+82 -102
file added
+100
file modified
+90 -2
file modified
+30 -19
file modified
+190 -12
file modified
+23 -20