[nvidia-settings/f38] (6 commits) ...Merge branch 'master' into f39