fixed extendig template path
Merge branch 'master' into 1.1