fix for go test
Merge branch 'kd' into mat

Conflicts:
	api/server2/server.go