ad29db9 Merge branch 'develop' into 'master' for 0.4.13 release

Merged and Committed by mkrizek 7 years ago
    Merge branch 'develop' into 'master' for 0.4.13 release
    
        
file modified
+1 -1
file modified
+3 -3
file modified
+6 -5
file modified
+6 -3
file modified
+26 -12
file modified
+1 -1
file modified
+23 -15
file modified
+7 -3
file modified
+12 -2
file modified
+72 -64
file modified
+83 -54
file modified
+20 -3