Merge branches 'redomasks', 'generatebiome' and 'up-noglass' into develop