Merge branch 'mesa_7_6_branch'