[golang/f19] (3 commits) ...Merge branch 'master' into f19