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