Fixed $templates#11

janmonschke wants to merge 2 commits into

bnolan:masterbnolan/capt:masterfrom

janmonschke:masterjanmonschke/capt:masterCopy head branch name to clipboard