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