Merge branch 'mesa_7_5_branch' into mesa_7_6_branch