[steam/el7: 19/19] Merge branch 'master' into el7