[nvidia-xconfig/f40] (2 commits) ...Merge branch 'master' into f40