[xorg-x11-drv-nvidia/f35: 6/6] Merge branch 'master' into f35