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