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