Fixes Issue 648 - Expand template mixins in ddoc.
Merge pull request #1480 from AndrejMitrovic/Fix648

Issue 648 - Expand template mixins in ddoc