[nvidia-xconfig/el7] (11 commits) ...Merge branch 'master' into el7