[mesa-freeworld/f38: 3/3] Merge branch 'master' into f38