[xorg-x11-drv-nvidia/f35] (10 commits) ...Merge master