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