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