update by go1.1
merge upstream