pr-13222-08f6f1 vs. 2412-31 / ogl-lin-mesa / mp7-text

pr-13222-08f6f1 (08f6f1d4) Diff 2412-31 (ada646a7)
Failure e678d8a8cb4c95c53024e88c532a59154488c123
Failure 8d6c9abdc86b114759d5338a648451de48e0e355