[xorg-x11-drv-nvidia/f24] (25 commits) ...fix merge