[mesa-freeworld/f37: 8/8] Merge branch 'master' into f37