[xorg-x11-drv-nvidia/f36: 2/2] Merge branch 'master' into f36