[xorg-x11-drv-nvidia/f26] (33 commits) ...Merge branch 'master' into f25