[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'f25' into f24