[golang/el6] (2 commits) ...Merge branch 'f20' into el6