[golang/f19] (4 commits) ...Merge branch 'f20' into f19