Merge branch 'nd/glossary-content-pathspec-markup' into maint