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