please merge glossary changes into master

nothing to add :)