Going back to implicit path
Merge branch 'master' into gh-pages
explicit path for templates
Merge branch 'master' into gh-pages