[golang/el6: 26/26] Merge branch 'f20' into el6