Update the go1 branch with the latest master