01bb04c Merge branch 'develop' into 'master' for 0.3.16 release

Merged and Committed by mkrizek 8 years ago
    Merge branch 'develop' into 'master' for 0.3.16 release
    
        
file modified
+3 -24
file modified
+1 -2
file modified
+17 -26
file modified
+26 -10
file modified
+3 -18
file modified
+2 -2
file modified
+30 -14
file modified
+20 -14
file modified
+1 -1
file modified
+14 -0
file modified
+21 -3
file modified
+4 -0
file modified
+24 -1
file modified
+0 -2
file modified
+1 -0
file modified
+18 -11
file modified
+25 -1
file modified
+26 -3
file modified
+2 -1
file modified
+10 -0
file added
+11