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