[nvidia-settings/f28] (7 commits) ...Merge branch 'master' into f28