Go 1.1.1 port

Go 1.1.1 port. Also ran `go fmt`.