#642 - Fixed typo in template.
Merge remote-tracking branch 'origin/t642' into t642