[xorg-x11-drv-nvidia/f36] (6 commits) ...Merge branch 'master' into f36