[xorg-x11-drv-nvidia/el7: 20/20] Merge branch 'master' into el7