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