make sure the template name is copied
Merge branch 'refs/heads/master' into 2.1