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