port to Go 1.1.1
ran go fmt