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