Merge changes of golang 1.2.1