[golang/f20] (5 commits) ...Merge branch 'master' into f20