Fix for issue #624
Merge pull request #631 from redstar/issue624

Fix for issue #624
doc: Fix description of when template function instances are skipped.
Merge pull request #632 from ckamm/doc-template-skip

Fix documentation for template emission skipping
Merge branch 'master' into merge-2.064