[nvidia-settings/f30: 3/3] Merge branch 'master' into f30