[nvidia-settings/el7: 12/12] Merge branch 'master' into el7