[nvidia-settings/el7] (12 commits) ...Merge branch 'master' into el7