fixing warning at t.Errorf
Merge branch 'master' into channels