[golang/el6: 5/5] Merge branch 'master' into el6