Added template_name page variable
Merge branch 'master' into my-3.0