[mesa-freeworld/f39: 7/7] Merge branch 'master' into f39