[steam/el7] (19 commits) ...Merge branch 'master' into el7