Merge branch 'jc/everyday-markup' into maint