[nvidia-settings/f27: 4/4] Merge branch 'master' into f27