Terminology rieks - %%-syntax-related bugfixes

Merged Rieks Joosten requested to merge terminology-rieks into master

Merge request reports