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