survive presence of empty layers
Merge branch 'master' into generator-assets