[golang/f19: 15/15] Merge branch 'master' into f19