Merge pull request #591 from golang/master-merge

Merge remote-tracking branch 'origin/dev' into master