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