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