bf1ca74 Merge branch 'develop' into 'master' for 0.4.6 release

Merged and Committed by mkrizek 8 years ago
    Merge branch 'develop' into 'master' for 0.4.6 release
    
        
file modified
+4 -0
file modified
+0 -15
file modified
+2 -2
file modified
+24 -14
file modified
+1 -1
file modified
+6 -1
file modified
+4 -10
file modified
+65 -40
file modified
+11 -12
file modified
+0 -3
file modified
+2 -0
file modified
+8 -6
file modified
+43 -54
file modified
+1 -1