WIP: rebased and modified PR #179#216

fingolfin wants to merge 1 commit intogap-packages:mastergap-packages/AutoDoc:masterfrom

fingolfin:mh/synonym_bugfingolfin/AutoDoc:mh/synonym_bugCopy head branch name to clipboard