gofmt
Merge pull request #2686 from shykes/gofmt

gofmt