Fix warning about already defined variable in template
Merge branch 'master' into github_master