front matter edit. not very DRY but works
Merge branch 'master' into frontmatter-edit