Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'