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