squash merge from dev branch

vendor/github.com/alecthomas/template/testdata/file1.tmpl

@@ -0,0 +1,2 @@
+{{define "x"}}TEXT{{end}}
+{{define "dotV"}}{{.V}}{{end}}

vendor/github.com/alecthomas/template/testdata/file2.tmpl

@@ -0,0 +1,2 @@
+{{define "dot"}}{{.}}{{end}}
+{{define "nested"}}{{template "dot" .}}{{end}}

vendor/github.com/alecthomas/template/testdata/tmpl1.tmpl

@@ -0,0 +1,3 @@
+template1
+{{define "x"}}x{{end}}
+{{template "y"}}

vendor/github.com/alecthomas/template/testdata/tmpl2.tmpl

@@ -0,0 +1,3 @@
+template2
+{{define "y"}}y{{end}}
+{{template "x"}}