[nvidia-xconfig/f29] (7 commits) ...Merge branch 'master' into f29