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