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