[xorg-x11-drv-nvidia/el7] (5 commits) ...Merge branch 'master' into el7