Merge branch 'sb/glossary-submodule' into maint