[nvidia-settings/f40] (5 commits) ...Merge branch 'master' into f40