[xorg-x11-drv-nvidia] (33 commits) ...Merge branch 'master' into f25