Merge branches 'redomasks', 'solidmask', 'generatebiome' and 'linecurve' into develop