7f0e10b Merge branch 'develop' into 'master' for 0.4.18 release

Merged and Committed by mkrizek 7 years ago
    Merge branch 'develop' into 'master' for 0.4.18 release
    
        
file modified
+1 -1
file modified
+3 -3
file modified
+3 -19
file modified
+2 -2
file modified
+3 -3
file modified
+1 -1
file modified
+7 -2
file modified
+1 -1
file modified
+8 -1
file modified
+2 -2
file modified
+1 -1
file modified
+1 -1
file modified
+65 -109