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