8c61643 Merge branch 'develop' into 'master' for 0.4.14 release

Merged and Committed by mkrizek 7 years ago
    Merge branch 'develop' into 'master' for 0.4.14 release
    
        
file modified
+1 -1
file modified
+1 -1
file added
+186
file modified
+4 -3
file modified
+2 -2
file modified
+1 -1
file modified
+44 -30
file modified
+1 -1
file modified
+1 -1
file modified
+5 -1
file modified
+1 -1
file modified
+16 -16
file modified
+14 -8
file modified
+1 -0
file modified
+2 -1
file modified
+143 -27
file modified
+60 -1