[xorg-x11-drv-nvidia/f40] (8 commits) ...Merge branch 'master' into f40