Advanced template#591

beathorst wants to merge 2 commits intobbc:masterbbc/wraith:masterfrom

wmdbsystems:advanced_templatewmdbsystems/wraith:advanced_templateCopy head branch name to clipboard