update path
Merge branch 'master' into golangv1.2.2