removing cruft
Merge branch 'yaml' into newextensions