Merge branch 'mesa_7_5_branch'