[xorg-x11-drv-nvidia/f25: 11/11] Merge branch 'master' into f25