Merge branches 'rotating', 'redomasks' and 'generatebiome' into develop