[nvidia-settings/f32] (3 commits) ...Merge branch 'master' into f32