[nvidia-xconfig/f31] (4 commits) ...Merge branch 'master' into f31