4aa8489 Merge branch 'develop' into 'master' for 0.4.12 release

Merged and Committed by mkrizek 7 years ago
    Merge branch 'develop' into 'master' for 0.4.12 release
    
        
file modified
+1 -1
file modified
+23 -3
file modified
+41 -19
file modified
+8 -3
file modified
+1 -1
file modified
+5 -0
file modified
+25 -2
file modified
+3 -2
file modified
+48 -5
file modified
+1 -1
file modified
+0 -14
file modified
+59 -1