fixing compile time error on test
Merge branch 'master' into go1