[xorg-x11-drv-nvidia/f40: 8/8] Merge branch 'master' into f40