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