Merge "Fix typo in template description"