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