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