[nvidia-xconfig/f29: 7/7] Merge branch 'master' into f29