update Go files from 1.2 distribution
Merge commit '4cae582064052af18782c403d1620960b50253dc'